Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add 'override' to built-in make variables #3028

Merged
merged 1 commit into from
Feb 28, 2024
Merged

Add 'override' to built-in make variables #3028

merged 1 commit into from
Feb 28, 2024

Conversation

WardBrian
Copy link
Member

Summary

Currently, setting CXXFLAGS and friends from the command line for make drops all the custom configuration we do. This causes issues like stan-dev/cmdstanpy#732

This uses make's override directive:

If a variable has been set with a command argument (see Overriding Variables), then ordinary assignments in the makefile are ignored. If you want to set the variable in the makefile even though it was set with a command argument, you can use an override directive...
To append more text to a variable defined on the command line, use:
override variable += more text

Tests

None

Side Effects

This does make it difficult to completely replace the CXXFLAGS variable Stan uses, but I think that is okay? We allow you to configure basically all the individual pieces already using e.g. TBB_LIB

Release notes

Checklist

  • Copyright holder: (fill in copyright holder information)

    The copyright holder is typically you or your assignee, such as a university or company. By submitting this pull request, the copyright holder is agreeing to the license the submitted work under the following licenses:
    - Code: BSD 3-clause (https://opensource.org/licenses/BSD-3-Clause)
    - Documentation: CC-BY 4.0 (https://creativecommons.org/licenses/by/4.0/)

  • the basic tests are passing

    • unit tests pass (to run, use: ./runTests.py test/unit)
    • header checks pass, (make test-headers)
    • dependencies checks pass, (make test-math-dependencies)
    • docs build, (make doxygen)
    • code passes the built in C++ standards checks (make cpplint)

  • the code is written in idiomatic C++ and changes are documented in the doxygen

  • the new changes are tested

@syclik
Copy link
Member

syclik commented Feb 27, 2024 •
edited
Loading

Whoa. Are we on make 4.4 yet? I don't think the override keyword is available for 3.81.

edit: it is!!!

@syclik
Copy link
Member

syclik commented Feb 27, 2024

@WardBrian awesome! I didn't realize override was in 3.81.

+1 to @SteveBronder's approval!

@stan-buildbot
Copy link
Contributor

Name Old Result New Result Ratio Performance change( 1 - new / old )
arma/arma.stan 0.29 0.22 1.32 24.2% faster
low_dim_corr_gauss/low_dim_corr_gauss.stan 0.01 0.01 1.04 3.43% faster
gp_regr/gen_gp_data.stan 0.04 0.04 1.06 5.58% faster
gp_regr/gp_regr.stan 0.13 0.14 0.94 -6.03% slower
sir/sir.stan 94.48 90.95 1.04 3.74% faster
irt_2pl/irt_2pl.stan 5.36 4.61 1.16 13.94% faster
eight_schools/eight_schools.stan 0.05 0.06 0.93 -7.44% slower
pkpd/sim_one_comp_mm_elim_abs.stan 0.3 0.3 0.99 -0.52% slower
pkpd/one_comp_mm_elim_abs.stan 22.06 21.26 1.04 3.63% faster
garch/garch.stan 0.54 0.55 1.0 -0.3% slower
low_dim_gauss_mix/low_dim_gauss_mix.stan 3.33 3.41 0.98 -2.41% slower
arK/arK.stan 1.89 1.86 1.02 1.95% faster
gp_pois_regr/gp_pois_regr.stan 2.94 2.85 1.03 2.81% faster
low_dim_gauss_mix_collapse/low_dim_gauss_mix_collapse.stan 10.88 10.49 1.04 3.55% faster
performance.compilation 264.78 261.96 1.01 1.06% faster
Mean result: 1.039391042740555

Jenkins Console Log
Blue Ocean
Commit hash: f70fb84db501edcbf822691c02664c43b76287b2

Machine information No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 20.04.3 LTS Release: 20.04 Codename: focal

CPU:
Architecture: x86_64
CPU op-mode(s): 32-bit, 64-bit
Byte Order: Little Endian
Address sizes: 46 bits physical, 48 bits virtual
CPU(s): 80
On-line CPU(s) list: 0-79
Thread(s) per core: 2
Core(s) per socket: 20
Socket(s): 2
NUMA node(s): 2
Vendor ID: GenuineIntel
CPU family: 6
Model: 85
Model name: Intel(R) Xeon(R) Gold 6148 CPU @ 2.40GHz
Stepping: 4
CPU MHz: 2333.844
CPU max MHz: 3700.0000
CPU min MHz: 1000.0000
BogoMIPS: 4800.00
Virtualization: VT-x
L1d cache: 1.3 MiB
L1i cache: 1.3 MiB
L2 cache: 40 MiB
L3 cache: 55 MiB
NUMA node0 CPU(s): 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62,64,66,68,70,72,74,76,78
NUMA node1 CPU(s): 1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31,33,35,37,39,41,43,45,47,49,51,53,55,57,59,61,63,65,67,69,71,73,75,77,79
Vulnerability Gather data sampling: Mitigation; Microcode
Vulnerability Itlb multihit: KVM: Mitigation: VMX disabled
Vulnerability L1tf: Mitigation; PTE Inversion; VMX conditional cache flushes, SMT vulnerable
Vulnerability Mds: Mitigation; Clear CPU buffers; SMT vulnerable
Vulnerability Meltdown: Mitigation; PTI
Vulnerability Mmio stale data: Mitigation; Clear CPU buffers; SMT vulnerable
Vulnerability Retbleed: Mitigation; IBRS
Vulnerability Spec rstack overflow: Not affected
Vulnerability Spec store bypass: Mitigation; Speculative Store Bypass disabled via prctl
Vulnerability Spectre v1: Mitigation; usercopy/swapgs barriers and __user pointer sanitization
Vulnerability Spectre v2: Mitigation; IBRS, IBPB conditional, STIBP conditional, RSB filling, PBRSB-eIBRS Not affected
Vulnerability Srbds: Not affected
Vulnerability Tsx async abort: Mitigation; Clear CPU buffers; SMT vulnerable
Flags: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb cat_l3 cdp_l3 invpcid_single pti intel_ppin ssbd mba ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm mpx rdt_a avx512f avx512dq rdseed adx smap clflushopt clwb intel_pt avx512cd avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts hwp hwp_act_window hwp_epp hwp_pkg_req pku ospke md_clear flush_l1d arch_capabilities

G++:
g++ (Ubuntu 9.4.0-1ubuntu1~20.04) 9.4.0
Copyright (C) 2019 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Clang:
clang version 10.0.0-4ubuntu1
Target: x86_64-pc-linux-gnu
Thread model: posix
InstalledDir: /usr/bin

@WardBrian WardBrian merged commit f72a360 into develop Feb 28, 2024
8 checks passed
@WardBrian WardBrian deleted the always-use-our-flags branch February 28, 2024 02:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SteveBronder SteveBronder SteveBronder approved these changes

@rok-cesnovar rok-cesnovar Awaiting requested review from rok-cesnovar

Assignees
No one assigned
Labels
build
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@WardBrian @syclik @stan-buildbot @SteveBronder